[XEN] Remove shadow2 dependencies from common code.

Disable debugtrace functionality even in debug builds:
it's currently only used by shadow2 maintainers.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/shadow2-common.c b/xen/arch/x86/shadow2-common.c
index 4b3b49e3330f496e7e23f3937dccb6bc46850c2d..89d3691bc4315ab9ad284b7d7c7fc7a2ce0bb306 100644 (file)
--- a/xen/arch/x86/shadow2-common.c
+++ b/xen/arch/x86/shadow2-common.c
@@ -32,6 +32,7 @@
 #include <xen/irq.h>
 #include <xen/domain_page.h>
 #include <xen/guest_access.h>
+#include <xen/keyhandler.h>
 #include <asm/event.h>
 #include <asm/page.h>
 #include <asm/current.h>
@@ -41,7 +42,22 @@
 
 #if SHADOW2_AUDIT
 int shadow2_audit_enable = 0;
-#endif
+
+static void shadow2_audit_key(unsigned char key)
+{
+    shadow2_audit_enable = !shadow2_audit_enable;
+    printk("%s shadow2_audit_enable=%d\n",
+           __func__, shadow2_audit_enable);
+}
+
+static int __init shadow2_audit_key_init(void)
+{
+    register_keyhandler(
+        'O', shadow2_audit_key,  "toggle shadow2 audits");
+    return 0;
+}
+__initcall(shadow2_audit_key_init);
+#endif /* SHADOW2_AUDIT */
 
 static void sh2_free_log_dirty_bitmap(struct domain *d);
 

diff --git a/xen/arch/x86/shadow2.c b/xen/arch/x86/shadow2.c
index b75c7062bd2d6e8a12968acd0ca7cbb4db179e59..597a005cdf54f57c4379ec8fdde5de94cf465eb2 100644 (file)
--- a/xen/arch/x86/shadow2.c
+++ b/xen/arch/x86/shadow2.c
@@ -111,7 +111,7 @@ typedef enum {
     ft_demand_write = FETCH_TYPE_DEMAND | FETCH_TYPE_WRITE,
 } fetch_type_t;
 
-#ifndef NDEBUG
+#ifdef DEBUG_TRACE_DUMP
 static char *fetch_type_names[] = {
     [ft_prefetch]     "prefetch",
     [ft_demand_read]  "demand read",

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 1fb50b6bd2b2590c26584d946902bc4a3e9ca3bc..e9e2b4d385472b121c13bf40a2d3f3b913d010a7 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -255,22 +255,6 @@ static void do_debug_key(unsigned char key, struct cpu_user_regs *regs)
                              bit. */
 }
 
-#ifndef NDEBUG
-static void debugtrace_key(unsigned char key)
-{
-    debugtrace_toggle();
-}
-
-static void shadow2_audit_key(unsigned char key)
-{
-    extern int shadow2_audit_enable;
-
-    shadow2_audit_enable = !shadow2_audit_enable;
-    printk("%s shadow2_audit_enable=%d\n",
-           __func__, shadow2_audit_enable);
-}
-#endif
-
 void initialize_keytable(void)
 {
     open_softirq(KEYPRESS_SOFTIRQ, keypress_softirq);
@@ -289,13 +273,6 @@ void initialize_keytable(void)
     register_keyhandler(
         't', read_clocks, "display multi-cpu clock info");
 
-#ifndef NDEBUG
-    register_keyhandler(
-        'O', shadow2_audit_key,  "toggle shadow2 audits");
-    register_keyhandler(
-        'T', debugtrace_key, "toggle debugtrace to console/buffer");
-#endif
-
 #ifdef PERF_COUNTERS
     register_keyhandler(
         'p', perfc_printall, "print performance counters");

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 9962c2e89a95d0d6738200f50d571d8b66eeae2a..75683ca0a1bfb89e853a9b231368c9ae9d6068f5 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -126,11 +126,6 @@ populate_physmap(
             for ( j = 0; j < (1 << extent_order); j++ )
                 guest_physmap_add_page(d, gpfn + j, mfn + j);
         }
-        else if ( unlikely(shadow2_mode_translate(d)) )
-        {
-            for ( j = 0; j < (1 << extent_order); j++ )
-                shadow2_guest_physmap_add_page(d, gpfn + j, mfn + j);
-        }
         else
         {
             for ( j = 0; j < (1 << extent_order); j++ )
@@ -184,7 +179,7 @@ guest_remove_page(
                 (unsigned long)page->count_info, page->u.inuse.type_info);
     }
 
-    shadow2_guest_physmap_remove_page(d, gmfn, mfn);
+    guest_physmap_remove_page(d, gmfn, mfn);
 
     put_page(page);
 
@@ -255,7 +250,7 @@ translate_gpfn_list(
     if ( (d = find_domain_by_id(op.domid)) == NULL )
         return -ESRCH;
 
-    if ( !(shadow_mode_translate(d) || shadow2_mode_translate(d)) )
+    if ( !shadow_mode_translate(d) )
     {
         put_domain(d);
         return -EINVAL;

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index f516230c2971429858efb7ccad81aa27b33cb3d0..1bba1612239b5354ae5da015b8d8f80830520070 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -427,7 +427,7 @@ int console_getc(void)
  * **************************************************************
  */
 
-#ifndef NDEBUG
+#ifdef DEBUG_TRACE_DUMP
 
 /* Send output direct to console, or buffer it? */
 static volatile int debugtrace_send_to_console;
@@ -459,7 +459,7 @@ static void debugtrace_dump_worker(void)
     printk("debugtrace_dump() finished\n");
 }
 
-void debugtrace_toggle(void)
+static void debugtrace_toggle(void)
 {
     unsigned long flags;
 
@@ -536,6 +536,11 @@ void debugtrace_printk(const char *fmt, ...)
     spin_unlock_irqrestore(&debugtrace_lock, flags);
 }
 
+static void debugtrace_key(unsigned char key)
+{
+    debugtrace_toggle();
+}
+
 static int __init debugtrace_init(void)
 {
     int order;
@@ -557,6 +562,9 @@ static int __init debugtrace_init(void)
 
     debugtrace_bytes = bytes;
 
+    register_keyhandler(
+        'T', debugtrace_key, "toggle debugtrace to console/buffer");
+
     return 0;
 }
 __initcall(debugtrace_init);

diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index e7d84afd927238aa6430d338fe9623c9a5ace7ae..00bb0830e9e3037441fe7e61064d6c5c4902d03e 100644 (file)
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -40,8 +40,8 @@ struct domain;
 
 void cmdline_parse(char *cmdline);
 
-#ifndef NDEBUG
-extern void debugtrace_toggle(void);
+/*#define DEBUG_TRACE_DUMP*/
+#ifdef DEBUG_TRACE_DUMP
 extern void debugtrace_dump(void);
 extern void debugtrace_printk(const char *fmt, ...);
 #else